From: Ian.Campbell@xensource.com Date: Mon, 22 May 2006 14:03:46 +0000 (+0100) Subject: Fix x86/64 -xenU build. probe_roms() is only defined if building a privleged X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16047^2~3 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=b0084aa59b3b73f9d82765ae45def818b41be098;p=xen.git Fix x86/64 -xenU build. probe_roms() is only defined if building a privleged or !xen build. Signed-off-by: Ian Campbell --- diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c index 13ad2b02bc..e986dfeafc 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c @@ -931,8 +931,8 @@ void __init setup_arch(char **cmdline_p) * Request address space for all standard RAM and ROM resources * and also for regions reported as reserved by the e820. */ - probe_roms(); #if defined(CONFIG_XEN_PRIVILEGED_GUEST) + probe_roms(); if (xen_start_info->flags & SIF_INITDOMAIN) { machine_e820 = alloc_bootmem_low_pages(PAGE_SIZE); @@ -944,6 +944,7 @@ void __init setup_arch(char **cmdline_p) e820_reserve_resources(machine_e820, memmap.nr_entries); } #elif !defined(CONFIG_XEN) + probe_roms(); e820_reserve_resources(e820.map, e820.nr_map); #endif